dnd: Remove gdk_drop_reply()

It was only necessary for Motif DND, and we don't support that anymore.

diff --git a/docs/dnd_internals.txt b/docs/dnd_internals.txt
index 56266ecb9715a0eeb1aebb24441cddcde65bc636..02fba41f9316b591e2a05e109d0d1e287b407504 100644 (file)
--- a/docs/dnd_internals.txt
+++ b/docs/dnd_internals.txt
@@ -71,9 +71,6 @@ straightforward manner.
 void             gdk_drag_status        (GdkDragContext   *context,
                                         GdkDragAction     action,
                                         guint32           time);
-void             gdk_drop_reply         (GdkDragContext   *context,
-                                        gboolean          ok,
-                                        guint32           time);
 void             gdk_drop_finish        (GdkDragContext   *context,
                                         gboolean          success,
                                         guint32           time);

diff --git a/docs/reference/gdk/gdk4-sections.txt b/docs/reference/gdk/gdk4-sections.txt
index 2553c35c2c8bb54f7eaa37a95e73c0b6ea264bb8..a01d39f1e7441a76b49b03fb246bd51460355148 100644 (file)
--- a/docs/reference/gdk/gdk4-sections.txt
+++ b/docs/reference/gdk/gdk4-sections.txt
@@ -775,7 +775,6 @@ gdk_cursor_get_type
 <FILE>dnd</FILE>
 GdkDragContext
 GdkDragCancelReason
-gdk_drop_reply
 gdk_drag_drop_done
 gdk_drag_begin
 gdk_drop_finish

diff --git a/gdk/broadway/gdkdnd-broadway.c b/gdk/broadway/gdkdnd-broadway.c
index 71545c565cc46a3ad201ba145f62d65d1ed89f29..b5ad024e219c32192612204715efc6fe6e4dd263 100644 (file)
--- a/gdk/broadway/gdkdnd-broadway.c
+++ b/gdk/broadway/gdkdnd-broadway.c
@@ -128,14 +128,6 @@ gdk_broadway_drag_context_drag_status (GdkDragContext   *context,
   g_return_if_fail (context != NULL);
 }
 
-static void
-gdk_broadway_drag_context_drop_reply (GdkDragContext   *context,
-                                      gboolean          ok,
-                                      guint32           time)
-{
-  g_return_if_fail (context != NULL);
-}
-
 static void
 gdk_broadway_drag_context_drop_finish (GdkDragContext   *context,
                                        gboolean          success,
@@ -165,6 +157,5 @@ gdk_broadway_drag_context_class_init (GdkBroadwayDragContextClass *klass)
   context_class->drag_status = gdk_broadway_drag_context_drag_status;
   context_class->drag_abort = gdk_broadway_drag_context_drag_abort;
   context_class->drag_drop = gdk_broadway_drag_context_drag_drop;
-  context_class->drop_reply = gdk_broadway_drag_context_drop_reply;
   context_class->drop_finish = gdk_broadway_drag_context_drop_finish;
 }

diff --git a/gdk/gdkdnd.c b/gdk/gdkdnd.c
index a86f405c8a1b9beae0d1b0260f17d82e1231d332..d7a58c98501fec528d2350ddd008c4f293bd1e22 100644 (file)
--- a/gdk/gdkdnd.c
+++ b/gdk/gdkdnd.c
@@ -534,27 +534,6 @@ gdk_drag_drop (GdkDragContext *context,
   GDK_DRAG_CONTEXT_GET_CLASS (context)->drag_drop (context, time_);
 }
 
-/**
- * gdk_drop_reply:
- * @context: a #GdkDragContext
- * @accepted: %TRUE if the drop is accepted
- * @time_: the timestamp for this operation
- *
- * Accepts or rejects a drop.
- *
- * This function is called by the drag destination in response
- * to a drop initiated by the drag source.
- */
-void
-gdk_drop_reply (GdkDragContext *context,
-                gboolean        accepted,
-                guint32         time_)
-{
-  g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-
-  GDK_DRAG_CONTEXT_GET_CLASS (context)->drop_reply (context, accepted, time_);
-}
-
 /**
  * gdk_drop_finish:
  * @context: a #GdkDragContext

diff --git a/gdk/gdkdnd.h b/gdk/gdkdnd.h
index 5b35f066c49681d1c291e5908548748470e3d170..3babca23077359de70717e4c245a9f5db8d10a91 100644 (file)
--- a/gdk/gdkdnd.h
+++ b/gdk/gdkdnd.h
@@ -108,10 +108,6 @@ void             gdk_drag_status        (GdkDragContext   *context,
                                          GdkDragAction     action,
                                          guint32           time_);
 GDK_AVAILABLE_IN_ALL
-void             gdk_drop_reply         (GdkDragContext   *context,
-                                         gboolean          accepted,
-                                         guint32           time_);
-GDK_AVAILABLE_IN_ALL
 void             gdk_drop_finish        (GdkDragContext   *context,
                                          gboolean          success,
                                          guint32           time_);

diff --git a/gdk/gdkdndprivate.h b/gdk/gdkdndprivate.h
index a2fa2b99960ab34feaf5002305ce7b814fb11299..5bb20e7b1c5b00649f9ae28115b3902268a5fdca 100644 (file)
--- a/gdk/gdkdndprivate.h
+++ b/gdk/gdkdndprivate.h
@@ -40,9 +40,6 @@ struct _GdkDragContextClass {
                                 guint32          time_);
   void        (*drag_drop)     (GdkDragContext  *context,
                                 guint32          time_);
-  void        (*drop_reply)    (GdkDragContext  *context,
-                                gboolean         accept,
-                                guint32          time_);
   void        (*drop_finish)   (GdkDragContext  *context,
                                 gboolean         success,
                                 guint32          time_);

diff --git a/gdk/quartz/gdkdnd-quartz.c b/gdk/quartz/gdkdnd-quartz.c
index 47612010173bba594d6f75c1e8855517d28d0954..b9b2656ba53ed853584a514657fa0e831ae5d182 100644 (file)
--- a/gdk/quartz/gdkdnd-quartz.c
+++ b/gdk/quartz/gdkdnd-quartz.c
@@ -78,14 +78,6 @@ gdk_quartz_drag_context_drag_status (GdkDragContext *context,
   context->action = action;
 }
 
-static void
-gdk_quartz_drag_context_drop_reply (GdkDragContext *context,
-                                    gboolean        ok,
-                                    guint32         time)
-{
-  /* FIXME: Implement */
-}
-
 static void
 gdk_quartz_drag_context_drop_finish (GdkDragContext *context,
                                      gboolean        success,
@@ -128,6 +120,5 @@ gdk_quartz_drag_context_class_init (GdkQuartzDragContextClass *klass)
   context_class->drag_status = gdk_quartz_drag_context_drag_status;
   context_class->drag_abort = gdk_quartz_drag_context_drag_abort;
   context_class->drag_drop = gdk_quartz_drag_context_drag_drop;
-  context_class->drop_reply = gdk_quartz_drag_context_drop_reply;
   context_class->drop_finish = gdk_quartz_drag_context_drop_finish;
 }

diff --git a/gdk/wayland/gdkdnd-wayland.c b/gdk/wayland/gdkdnd-wayland.c
index 74d9c0e1c92f33fdb782825a7eda0ee3c3ceb8c6..1ff24fada59a8ca915f33abd4f2d18245209fd04 100644 (file)
--- a/gdk/wayland/gdkdnd-wayland.c
+++ b/gdk/wayland/gdkdnd-wayland.c
@@ -234,15 +234,6 @@ gdk_wayland_drag_context_drag_status (GdkDragContext *context,
   wayland_context->selected_action = action;
 }
 
-static void
-gdk_wayland_drag_context_drop_reply (GdkDragContext *context,
-                                    gboolean        accepted,
-                                    guint32         time_)
-{
-  if (!accepted)
-    gdk_wayland_drop_context_set_status (context, accepted);
-}
-
 static void
 gdk_wayland_drag_context_drop_finish (GdkDragContext *context,
                                      gboolean        success,
@@ -438,7 +429,6 @@ gdk_wayland_drag_context_class_init (GdkWaylandDragContextClass *klass)
   context_class->drag_status = gdk_wayland_drag_context_drag_status;
   context_class->drag_abort = gdk_wayland_drag_context_drag_abort;
   context_class->drag_drop = gdk_wayland_drag_context_drag_drop;
-  context_class->drop_reply = gdk_wayland_drag_context_drop_reply;
   context_class->drop_finish = gdk_wayland_drag_context_drop_finish;
   context_class->drop_finish = gdk_wayland_drag_context_drop_finish;
   context_class->read_async = gdk_wayland_drag_context_read_async;

diff --git a/gdk/win32/gdkdnd-win32.c b/gdk/win32/gdkdnd-win32.c
index 68ed58d3b3f9f7158bec3241ec2a1e681517ac32..c82c8381afa55edd81a98902a34c6d5b79dbee74 100644 (file)
--- a/gdk/win32/gdkdnd-win32.c
+++ b/gdk/win32/gdkdnd-win32.c
@@ -2494,23 +2494,6 @@ gdk_win32_drag_context_drag_status (GdkDragContext *context,
     }
 }
 
-static void
-gdk_win32_drag_context_drop_reply (GdkDragContext *context,
-               gboolean        ok,
-               guint32         time)
-{
-  g_return_if_fail (context != NULL);
-
-  GDK_NOTE (DND, g_print ("gdk_drop_reply\n"));
-
-  if (!use_ole2_dnd)
-    if (context->dest_surface)
-      {
-       if (GDK_WIN32_DRAG_CONTEXT (context)->protocol == GDK_DRAG_PROTO_WIN32_DROPFILES)
-         _gdk_dropfiles_store (NULL);
-      }
-}
-
 static void
 gdk_win32_drag_context_drop_finish (GdkDragContext *context,
                 gboolean        success,
@@ -3234,7 +3217,6 @@ gdk_win32_drag_context_class_init (GdkWin32DragContextClass *klass)
   context_class->drag_motion = gdk_win32_drag_context_drag_motion;
   context_class->drag_abort = gdk_win32_drag_context_drag_abort;
   context_class->drag_drop = gdk_win32_drag_context_drag_drop;
-  context_class->drop_reply = gdk_win32_drag_context_drop_reply;
   context_class->drop_finish = gdk_win32_drag_context_drop_finish;
 
   context_class->get_drag_surface = gdk_win32_drag_context_get_drag_surface;

diff --git a/gdk/win32/gdkdrop-win32.c b/gdk/win32/gdkdrop-win32.c
index 1d9dac87f638167578508821de2cd9414ee2c364..d2a9656a86d1e85ca23935c3cf82a9d65c675591 100644 (file)
--- a/gdk/win32/gdkdrop-win32.c
+++ b/gdk/win32/gdkdrop-win32.c
@@ -874,23 +874,6 @@ gdk_win32_drop_context_drag_status (GdkDragContext *context,
     }
 }
 
-static void
-gdk_win32_drop_context_drop_reply (GdkDragContext *context,
-                gboolean        ok,
-                guint32         time)
-{
-  g_return_if_fail (context != NULL);
-
-  GDK_NOTE (DND, g_print ("gdk_drop_reply\n"));
-
-  if (!use_ole2_dnd)
-    if (context->dest_surface)
-      {
-        if (GDK_WIN32_DRAG_CONTEXT (context)->protocol == GDK_DRAG_PROTO_WIN32_DROPFILES)
-          _gdk_dropfiles_store (NULL);
-      }
-}
-
 static void
 _gdk_display_put_event (GdkDisplay *display,
                         GdkEvent   *event)
@@ -1213,7 +1196,6 @@ gdk_win32_drop_context_class_init (GdkWin32DropContextClass *klass)
   object_class->finalize = gdk_win32_drop_context_finalize;
 
   context_class->drag_status = gdk_win32_drop_context_drag_status;
-  context_class->drop_reply = gdk_win32_drop_context_drop_reply;
   context_class->drop_finish = gdk_win32_drop_context_drop_finish;
   context_class->read_async = gdk_win32_drop_context_read_async;
   context_class->read_finish = gdk_win32_drop_context_read_finish;

diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c
index d65ed28254ae3d0808ade8416d6cdbb28c54197f..54138c047f4af5d29288ec179ecfd13693d46401 100644 (file)
--- a/gdk/x11/gdkdnd-x11.c
+++ b/gdk/x11/gdkdnd-x11.c
@@ -243,9 +243,6 @@ static void        gdk_x11_drag_context_drag_abort  (GdkDragContext  *context,
                                                      guint32          time_);
 static void        gdk_x11_drag_context_drag_drop   (GdkDragContext  *context,
                                                      guint32          time_);
-static void        gdk_x11_drag_context_drop_reply  (GdkDragContext  *context,
-                                                     gboolean         accept,
-                                                     guint32          time_);
 static void        gdk_x11_drag_context_drop_finish (GdkDragContext  *context,
                                                      gboolean         success,
                                                      guint32          time_);
@@ -402,7 +399,6 @@ gdk_x11_drag_context_class_init (GdkX11DragContextClass *klass)
   context_class->drag_status = gdk_x11_drag_context_drag_status;
   context_class->drag_abort = gdk_x11_drag_context_drag_abort;
   context_class->drag_drop = gdk_x11_drag_context_drag_drop;
-  context_class->drop_reply = gdk_x11_drag_context_drop_reply;
   context_class->drop_finish = gdk_x11_drag_context_drop_finish;
   context_class->read_async = gdk_x11_drag_context_read_async;
   context_class->read_finish = gdk_x11_drag_context_read_finish;
@@ -2450,13 +2446,6 @@ gdk_x11_drag_context_drag_status (GdkDragContext *context,
   context_x11->old_action = action;
 }
 
-static void
-gdk_x11_drag_context_drop_reply (GdkDragContext *context,
-                                 gboolean        accepted,
-                                 guint32         time_)
-{
-}
-
 static void
 gdk_x11_drag_context_drop_finish (GdkDragContext *context,
                                   gboolean        success,

diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index 53bfac35694ff3bb70f5270a0779e8fc548c8f3f..6613243566436a8eb4dcb9138b52cc5072015899 100644 (file)
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -468,15 +468,8 @@ _gtk_drag_dest_handle_event (GtkWidget *toplevel,
         
         /* Send a reply.
          */
-        if (event_type == GDK_DRAG_MOTION)
-          {
-            if (!found)
-              gdk_drag_status (context, 0, time);
-          }
-        else if (event_type == GDK_DROP_START)
-          {
-            gdk_drop_reply (context, found, time);
-          }
+        if (!found)
+          gdk_drag_status (context, 0, time);
       }
       break;